Fixed the bug described in TDS-575.