Fix for issue #275