Fixed Issue #229 from balupton