Convert #280339 to Flügger