Fixed #1156