fixing parser issues