Fixed SourceParser