Fix namespace issue around Shape result