Solution for #507 Jill Rides Again