Fix BUG #1536

See #1536