Fixing static refs
Fixing static refs