Fix multiple className issue (better)