Fixes #204, or I forgot something.