fixing #1130