fixes Issue #233