Fixing loading bugs
Release candidate