Fix the interface move issue