This was indeed a problem I noticed with my original PR, and I have not gotten around to trying to resolve it.