Hotfix for Jensen patch, making it faster and better.