Ajay | #4151 | Fixing ut