Remove stupid TODO and fix it myself