Fixed Issue #259 bug