Further fixes on usign the same object