Convert #623606 to Flügger