continue here .....will fix soon