Convert #629448 to Flügger