Bug fix for restore option.