FinalBuilder implementation fixed