fixed for r-y