Fix when creating new stub instances were overwriting previous ones