[Fixes] - Fixed multiple instance issue