Fixed Issue #259