Fixed Issue #274