fix the base order