fixes Issue #37