Attempt to fix #375