Fixed removed code