Yeah, I didn't think of that. So much for TDD. :(

This PR can be closed then since it won't work.