Fixed Parsing issue for UI