Fix Manager class