bug and build fix