Convert #341606 to Flügger