Fixes #91. Oops re: last bad commit of this module.