temp: more hacks. check if these are really needed?