Fixed multiple instances issue