fix chocolate singleton