Fixes Issue #1157