#RSPL-5148 fixed