Fix Classes Manager