Fixing isue