Fix additional class bug