Back to better variant to avoid freezing. #SCL-6439 Comment