final fix for singleton issue