Modify by comments in #17