Fixed Issue #29