more in depth fix, covering more grounds