Merge pull request #2322 from andrei-21/fix/instant-overflow