Please check whether the attached patch works for you (it does for me); then possibly consider removing the corresponding "if" statements altogether.
Please check whether the attached patch works for you (it does for me); then possibly consider removing the corresponding "if" statements altogether.