prepare to fix
fix in style