Comment 32 for bug 1505948

Created attachment 1137050
proposed patch #2

Could you please test with these two patches?