Fic for Issue #2150

Fix for Issue #2150