fixes Issue #431