I don't feel very comfortable with this. But it fixes #51.