KER-239: code simplified