HashMap Fix