Fixed #275