fixing static stuff