Fixing ordering on API