fix parsing issues with the latest change