Fixing Parse Issue