fixed static handler