Consistent to s

Originally #613