Convert #338638 to Flügger