fix after merge auto717

second merge fix problems