Convert #685337 to Flügger