This should work on more machines