attempt to fix #939