Addressed a TODO