Fixed Issue #281