fixed warning and tests
eliminated bug introduced with latest revision

please add to 6.1.1.