Ensure correct order