Fixed broken packaging after merge