bug fix for issue #1036