Fixed #1088