Fixed issue, based on TCK blackbox tests.