Fixes Issue #3400

See Issue #3400