fixing #1032