Fixed #1171