Fixed the whole app