Fixed a bug with loading