Fix namespace issue