Fix Order Bug