Fixes Issue #424