1.6 fix
this seems to build on 1.6