Fix member order