Fix order to stop nil? issues