fix for #entry returning new instance for each call