Convert #229627 to Flügger