add missing and fix router