applied patch from ajbw #59