Corrected in accordance with a recent refactor.