Fixed so that unloading of grammar is faster