Attempt to fix #17