Convert #517388 to Flügger