Convert #517623 to Flügger