Fixed #248
Fixed #250