Fix parsing issues
Fix bug