DF-4523 -  fixed also for child controls.