fixed bugs
fixed parse failure