Changes to fix #78.