trying to fix the singleton. Weird, did is change in a minor version?