fixed bug with leaking value objects