Comment 12 for bug 1840236

Created attachment 145163
proposed patch