Fixing class/id bug