Fixed Issue #271