Fix BUG #1536 for 1.2.5

See #1536