Fixes #4

For now at least.