fixed issues with parse