fixes me being stupid and not setting creator right

Now for the conflicts...