attempt to fix #1023