Fixed #1037