Fixed #1635