Update on previous bug fix

This method is even faster.