Convert #372249 to Flügger