Begin to fix #1