Removes duplication at #65