Fix improper merge from previous commits (deleted duplicated lines)