fixed static stuff