Fix DataShape bug