fixing issue #1136