Fix possible disk mis-sorting within controller