The fix for issue #3