Convert #368554 to Flügger