fix packaging once and for all