1.07 buildfix