Fixed Issue #258