fix moved class in context