Default case fixed