bug fixed cont.