build system fix