Fix spare cases