Now M-n and M-p behave as they should