Fixing static visibility