Fix for Issue #2142

Fix for Issue #2142