another attempt to fix #3