Make apb_update_7005() more robust