FIX: Newest numpy doesn't like addressing dimensions that don't exist.