Another attempt to fix #5.
Another attempt to fix #5.