Issue #527