Convert #438047 to Flügger