Fixed the problem of returning the same dict over and over