Commit to fix multiple time loading of handlers