Aaaaaaaaaaaaaaaaaaaaaaah bad regex!
Oops? Fixes #30.