Fixed for the new homepage classes