attempt to fix #5574