Fix for issue 2490.
Merge pull request #2497 from bakercp/hotfix-2490

Fix for issue 2490.