Removed detached from singleton because it was giving false/positive results.