Convert #241597 to Flügger