Convert #335935 to Flügger