Convert #618138 to Flügger