Fix bug in singleton
Final merge