Fixing object

I'll have to build a generator so I don't need to hand-code these.