Singleton Hotfix.

See my [commit message](https://github.com/virtuoushub/fuzzy-octo-shame/commit/4f69f714d854bf40b665db8030de2a7e64ddb8d0) and comments for #6