#4370 fixed commit