Fix for addon ondemand generation