GRIM: fixed issue #1083 (revert old behavior)