Fixed OnCircle/issues#27