Fix Result after code reorganization