Fix proposed for #2390

Here is an idea for fixing this issue I opened (#2390).  That is, if you are interested in this functionality.