switch messages fixed