Had to revert to string parsing