Fixed Issue #251