Changed back wrongly modified code