fix xi -> r