BUG Fix previous "optimization"

It was much faster. Also wrong.