Fixed #269
Fixed #269