Bug Fix - Extended grammer