Fix class cast error... probably more to come.