Fixes a performance bug - pointed out by Andrew.
Signed-off-by: NMark Fasheh <mark.fasheh@oracle.com>