Trying again to fix #24.