Added another check to resolve based on ts