Class magic wrap fixed