Fix for our machine