surrogate instantiation bug fixed