Fixed: issue with universal plugin