possibly fix #2522