Fix r accuracy/W sticking to target