Fixed #528;