fix issue#6 bug