fixed final case error