Setting back the initial value when a command has succeeded - fixing #359