Fix for Issue #666 (OTS review by Marc).