Convert #658237 to Flügger