Fixes Issue #35