+r fixed!