Fix Parse Issue