Fix ordering issue with preamble fragment