another regression fixed
Merge branch 'master' into npRmpi