Fixed #1718