Fixed package generation