bug fix fore Fx < 28