Building set fixed finally