Ermagersh. That was stupid. This fixes #1 and fixes #2.