Convert #229618 to Flügger