Fixes Issue #32