Adapt Rmax to filling

consistent with euo version f18ccfe