RE: #44, fix the case statement