Fix issue #275