Convert #658409 to Flügger