fixing bugs with newly added classes