Improved performance in this extension method!