fix
add condition
fix