Fixed #1435