fixed errors after converting from singletons