Fix ordering in production: