Fix bug where no case would be set