issue 3319 - address Shane's review comment, and add his test