Fix for issue #2107