Fix issue #125

I believe this change will improve the robustness and resolve the build issue from the demo in-class today.

I blame Gonzo.