Improved fix for issue #1618