Bug fix
simplify