Fixing vararrrrghs! (pirate edition)