grammar improvement for issue #109