This fixes #6.
Previous commit also fixed #9.