Now with slightly less crashing.