Changed fix to conform with previously established method contract.  Unit tests
now run and pass.