little parser improvement