Better, resolved issue with parse