Resolved another TODO