fixed build (for real)