Fixing issues of ViDI