fix for 59496888