Bug 964335

Patch for https://bugzilla.mozilla.org/show_bug.cgi?id=964335