Fixed self type for cases