fix to ordering