My own sins. fixes #3