Fixed references to models in target event