Fixing GET_SHAPE macro