Fixes spookoween.

Merge posthaste so we can spook.

(TESTED)