Fixed order bugs