fixin before order