DC/Melanie | #0000 | Bug fix:Adding class to first matched element