fixing the fix #3