Fix the nefarious bug that broke Andy's demo