Fix internal controller routing