Fixed chacking for r or n