Modified two-line solution for ticket #4261 to one-line based on feedback/solution from B. Barringer