fixed bug 43624 with solution by Brian McCloskey

Change-Id: I1b5dfcd1a21857afb2a7d5ccf025cd98fa4daf7a