Fixed multi instance flaws