Let's do as r-type suggests. Fixes #1.