major bug fix - addon working as intended