Fix to stupid parsing logic