Convert #324382 to Flügger