Fixed #274
Fixed #258