Fixed NOBUG-22 (CR in description)