walk/bike mode handling - fixes #4231