Fix constructer arg ordering