Convert #629339 to Flügger