changed mult return statements in LocatorFactory to one