some fix #1