trial fix for ticket:288; merged eb/fusb 9543:9544 to trunk