Bug fix related to bare metal server ordering