Resolved issue #33