Another correcting commit due to the workspace cleanup