Fixed Issues with parsing