Fix packaging error with trolley where it would be in a loop