Hmm, I see this is already reported as Bug#161912. However, this report includes a patch :-) Feel free to merge them anyway.