Jon Dart's Linux fix part 2