bug fix switch
merge