GF 4.1 fix