Spot fix let-of until proper fix