bug 1001704 - update for proper API usage