Attempt to support older base