Fix badge parsing

This PR fix issue on parsing badge.