Another patch for r285.
If you run in to any problems please file an issue following all the guidelines, as we need all that information to be able to help.