Comment 14 for bug 1815339

Created attachment 16882
patch

Patch to fix this and Bug 699713