Fixes Issue #653