another attempt to fix #1