This fixes #81, which was similar to #82