bug fix
generic style