Target is right

To aim for the right target then we have to have the right buffer too.