Added a hacky fix for random parsing bug