fixing ordering