Fixes Issue #1416

Fixes Issue #1416