All is broken once again, read TODO and fix