MAP-964: improve rule