Hotfix Empty question buffer.
Merge branch 'master' into inbox