attempt to fix #340