Convert #366248 to Flügger