Fix uninstall issue