Created attachment 695193 [details] proposed patch Completely untested patch. Will try to test it next week.