Start correction according to Josef's and Ralph's comments