Mutiple instance fix