Fixed bug with loader