Jon Dart's Linux fix