Update - resolve bug with many instance at one place :)