Fixed #1723