fixed: gf 1.7 compatibility