attempt to fix #729