#677 - more performant solution