adapt to latest mvc update