Fixed Issue #253