Fixed major oversight from class rewrite