Created attachment 90196 [details] [review]
possible fix

Does the attached patch fix the issue?  Also, please attach files rather than
pointing to pastebin since pastebin entries can disappear.