Fix bug introduced for SINGLETON mode