Fixes r-suffix bug. Fixes #18.