fixing isue