Comment 31 for bug 1505948

Created attachment 1137049
proposed patch #1