fix #18
scm review