Fix for better run times