Simple patch incoming
Created attachment 61499 [details] proposed patch
*** This bug has been marked as a duplicate of bug 42240 ***