Add check whether switch was successfull