Convert #339381 to Flügger