Fixed #411
Fixed #403