Temporary fix to OrderOrder standing up issue