Shouldn't this line be changed too?