Convert #229396 to Flügger