fix #2, fix #3