make it more robust

Change-Id: Iec434674dff409adedc6549de8765f689d7353f8