#112 - Compatibility with TDS 7.1