Fixed #1627