Convert #357381 to Flügger