Fixed Issue #33