Convert #624618 to Flügger