Fixed the fix
Finally fixed issue