attempt to fix #1394