TableSpace Fix