ZD-10152: fixed, improved