Convert #324225 to Flügger