Fixed core to return rangy