Fixed ObjectCreator and location arrays