Fixed prev issues