Fix for regression due to parser changes

@junmendoza please take a quick look

I have run ProtoTest and DynamoCoreTests without regressions.