Fix logic to bypass limit