Tweak for correctness