little bit of fixing on parser