Fix addon package

Closes #1610