Improved the fix for issue #1