Re-add wrongly removed code