attempting to fix #5006