active class bug fixes