Fix for issue reported in comments on commit 9340705.