Fixed #1145