-trying to fix #5817