Fix for the fix #2