Fix for issue #2695

I've verified this fix to work.