Fixing #275