Fix for lower-cpu machines