Fixing #527