MAP-964: fix