Fix -g touching the cwd project's state (#436, #445)

Fix -g touching the cwd project's state (#436, #445) #96