Should fix automatic packaging