[fix] Improved speed on all machines.