Fixing issue with multiple instances