fixing issue #1159