Convert #359442 to Flügger