Added border case for "substring" mapping.