Fixed package build