FIX for thread hang + FIR initial