Objects are now correct tracked