prob bug fixed