Fixed #1745