Buildsystem fix