Fix uninstall handler