Trying to fix order bugs