Convert #337602 to Flügger