Fixed type of associative data handling points in the code related to cf6694c6df8aae0d01d4248399f7872baa28282a