issue #18
comment fix
comment fix II