working towards a fix for gf 0.2