changes for r 3.5