fixes to multiple instantiations