Convert #418489 to Flügger