#1290 Fix packaging