Fixing a merge error with actor enviroment.