bug fixed &.....