Fix: moving misplaced lines into #ifdef FEATURE_FORCE