Fix Parse method