Fix : Loader was not finishing