V17.0.6, fixed map and ap