Convert #370486 to Flügger