r8164: fixed improved building