Added check to not overwrite native promises