Fixed classes, now colliding again...