- Fixed bug where not all cases were being used