Oxed Class fixed