Fixed #1425