fix static bugs