Fix for issue #2236