Fixed #497
Fixed #498