Move addon stuff back to _update_next function, so it doesn't break anymore :)