Made the static fields allocate the correct amount of space