force once is enough

rewrites ade461e and 70f84bf