Changes to make it work on new laptop with 24.4.5