Fixed #1604