Convert #335539 to Flügger