some fix for TPA and horizon mode!