Fixed memory error in Analysis system (from 600MB to 32 MB)