finished the fix #1