Partially fixed build