Bugs fixed
Loader