Fixing static vars