Fix for addon compatibility