Fix Bug #12618
fix buid generation