FORCE_BUILD fix