Fixes Issue #3450

Fixes Issue #3450