Fixed to work with 1.1 public API.