Minor implementation change