fixed router
fixed migration