Fix potential crash in T3656 workaround