Attempt to fix the case issue