Have fixed the whole app