Updated bug in switch