Attempt to fix #27