Fixed a mistake and fixed build (todo)