TEMP: Fix bug with singleton