Convert #541477 to Flügger