Fixing order (7/30)

Fixing order