fixes ordering I messed up