fix and tests for https://bugzilla.mozilla.org/show_bug.cgi?id=941037