fixed sub-mapping bug 1, before fixing submapping bug 2 (only predicate
used for submapping)
...