First attempt to fix #17.