Convert #541636 to Flügger