[#37746913] another attempt at fixing this amazing bug