Fixed #1692