Fixed Issue #275