Bug fix for #275