Fixes #1, properly this time, I hope.