Fixed bug in auto-parsing logic