Convert #359237 to Flügger