Fixed infinite loading