case updated from freds comments