Minor object-orientation fix

Fuck everything!