Fix for issue #2016