Convert #564339 to Flügger