Fix recovery issue

Thanks Mahdi

Change-Id: Ic062698b16fe37ecb17607f96b8017bf7892ee7a