Update for compatibility with 1.x releases