Fixed package loading