Fix crash, but still terribly broken.