Singleton logic terminated. Check for bugs