Bug with multiple instance fixed