It was before I removed the singleton