Convert #390425 to Flügger