Fixed #1532