VID-1827 Fixing the processing