Fixes #26 and associated casual world hack error.