Fixed Gadget class