Attempt to fix #21.