Convert #324848 to Flügger