partial fix to ordering issue