Compilation fix after merge. (Fix needs to be re-analyzed for blocking call)