fix 'r' command, see #451