Implements OnCircle/core#128