Convert #487517 to Flügger