Fixed #1676