attempt to fix #611