Fixes Issue #1239