sync hiro's bugfix for BSD (include omission)