more hacks for zpu :)