Tried fixing cases