Convert #359396 to Flügger