attempt to fix #334