Wyvern Fix

(Hopefully) resolves an infinite loop error with the Wyvern, regarding multiple visits.