take new dimensions into account

in addition to pull request #1480