Temporary fix of add_on_change