Fixes Issue #45