Fixes #1643 - no more freeze but now I have to understand why we go over
4k there