Fix for the never-ending loading