Fix crash from addon circuits