Added minor diagnostic tweak, will make it into final version in alternate form