Fixes Issue #1755