Fix for retry on command execution

Change-Id: I395314ff45f9261e986334bb4bb061f0b89bad8b