improved further on parse check