Attempt to fix #340