Fixed #1332