Changed static-handler
Changed static-handler