some fix #1
some fix #2