Ninja-fixing a bug 10 minutes before the demo

Submitted by devdojo