Fixes Issue #33