I was facing the same problem with Baleno and it was resolved after replacing the clumps which used to lock the air filter.Locks of air filter was not tight enough which result in suck more air and cause the engine to shutdown.
Do check the air filter first if problem still persist then go for tappat adjustment.