BUG ISSUE FIXED