Fixed missed class/ID change