Fix for Reinstall issue