Fixes Issue #1156