Fix F16,EL6 after fixing F18