Fixes Issue #1036