Resolve Same last issue