bug fix issue #1043