some fix
some fix 2
add fix 3