trying a dirty fix