Completing with offline buffer works a little bit better