final build fix