ref #4
Fixed #4
refactoring jelly.