Fix bug with missing completion context