fix issue 225. improve parser