Fixed package export