parser issues fixed