Alittle rework #4307