Fix not working default case