src2 minifix (still experimental...)