Alternative to pr #2