fix for 61553824
fix for 59496888