BUG Fixed typo in previous manual merge