parts 2 & 3 to fix issue 88. 

parts 2 & 3 to fix docbloc issue 88.