Here is fix of uninstall feature