Fix problems with use standard package