Fixed #4942 (1.61 is very slow (compared to 1.60.1))