MAL-88 | Fix order