fixed a template issue
fixed issue with parsing