Fixed cache-clobbering issue in Library