Fixed problem with parse crashes