Fix BUG #1536