fix static handlers